Derive Clone when deriving Copy

diff --git a/Cargo.lock b/Cargo.lock
index b8d6ec6ed27506e8f098d9db23a5f5e3bfdc933a..e0ae1f18d9e64d3d1000ad748eb0f12b64289c1c 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,7 +21,7 @@ dependencies = [
  "semver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "tar 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "threadpool 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -279,7 +279,7 @@ dependencies = [
 
 [[package]]
 name = "term"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index f887eb1dd52264f700823aaed9330f93aae39bf0..d6d4e898452b2214464d0cf6127522f202137472 100644 (file)
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -60,7 +60,7 @@ pub struct PackageRegistry<'a, 'b: 'a> {
     locked: HashMap<SourceId, HashMap<String, Vec<(PackageId, Vec<PackageId>)>>>,
 }
 
-#[derive(PartialEq, Eq, Copy)]
+#[derive(PartialEq, Eq, Clone, Copy)]
 enum Kind {
     Override,
     Locked,

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index a33614dc108492540fe8f86fa1a09482df2e9ad7..d3b58c8fb6e70b189f8a8f6a6b29d92d5d7ca499 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -29,7 +29,7 @@ pub struct Resolve {
     metadata: Option<Metadata>,
 }
 
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub enum Method<'a> {
     Everything,
     Required{ dev_deps: bool,

diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
index ad28ae63ddb36858f0adbb70ee5c7f06b2147d97..605b9a175bededcf540d7cdf79e8fc6567c75df4 100644 (file)
--- a/src/cargo/core/shell.rs
+++ b/src/cargo/core/shell.rs
@@ -8,7 +8,7 @@ use term::{Terminal, TerminfoTerminal, color};
 
 use self::AdequateTerminal::{NoColor, Colored};
 
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub struct ShellConfig {
     pub color: bool,
     pub verbose: bool,

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 12b1e0d8d3c7881f425be47e7fe82ab82c8dab9c..0ef49cdde258cecd64fac0282ba93ffe74019060 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -60,7 +60,7 @@ pub struct CompileOptions<'a, 'b: 'a> {
     pub mode: CompileMode,
 }
 
-#[derive(Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq)]
 pub enum CompileMode {
     Test,
     Build,

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 7eedd117e037ac8a8e3cfe10d2cf30e37afddd58..0247213535fd0157a99409deff86cea2bd519a23 100644 (file)
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -11,7 +11,7 @@ use git2::Config as GitConfig;
 use util::{GitRepo, HgRepo, CargoResult, human, ChainError, internal};
 use util::Config;
 
-#[derive(Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum VersionControl { Git, Hg, NoVcs }
 
 pub struct NewOptions<'a> {

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index b5d0d917099220e89c6d7ea3368ee71bbd598af0..80f023bdf62d556f6496f7be2f0590890aa0ecfe 100644 (file)
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -18,7 +18,7 @@ use super::layout::{Layout, LayoutProxy};
 use super::{Kind, Compilation, BuildConfig};
 use super::{ProcessEngine, ExecEngine};
 
-#[derive(Debug, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub enum Platform {
     Target,
     Plugin,

diff --git a/src/cargo/ops/cargo_rustc/engine.rs b/src/cargo/ops/cargo_rustc/engine.rs
index b9c1ca1f1e0ed5b30a0e6a1aeb35c5b333f35c4c..75c4672173b51cbd6a4bc1b590cea407d0642ecb 100644 (file)
--- a/src/cargo/ops/cargo_rustc/engine.rs
+++ b/src/cargo/ops/cargo_rustc/engine.rs
@@ -13,7 +13,7 @@ pub trait ExecEngine: Send + Sync {
 }
 
 /// Default implementation of `ExecEngine`.
-#[derive(Copy)]
+#[derive(Clone, Copy)]
 pub struct ProcessEngine;
 
 impl ExecEngine for ProcessEngine {

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 46cef33b97a607a48b6032203880894b190cc5ca..19e42294df055804fb529470741b4d2bdb3720a8 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -31,7 +31,7 @@ mod job_queue;
 mod layout;
 mod links;
 
-#[derive(PartialEq, Eq, Hash, Debug, Copy)]
+#[derive(PartialEq, Eq, Hash, Debug, Clone, Copy)]
 pub enum Kind { Host, Target }
 
 #[derive(Default, Clone)]

diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs
index 6d5553a6e7a3bed9b62392979ed13836f53c38ee..f66e503d37d640e09376634d8b601b4b4167b2de 100644 (file)
--- a/src/cargo/util/dependency_queue.rs
+++ b/src/cargo/util/dependency_queue.rs
@@ -39,7 +39,7 @@ pub struct DependencyQueue<K, V> {
 ///
 /// A fresh package does not necessarily need to be rebuilt (unless a dependency
 /// was also rebuilt), and a dirty package must always be rebuilt.
-#[derive(PartialEq, Eq, Debug, Copy)]
+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub enum Freshness {
     Fresh,
     Dirty,

diff --git a/src/registry/lib.rs b/src/registry/lib.rs
index e8f4d51ab2b06b055500cc5081cc069f4a9f0bee..c7ba6f0298914202b9299ea65d8083af7868de15 100644 (file)
--- a/src/registry/lib.rs
+++ b/src/registry/lib.rs
@@ -22,7 +22,7 @@ pub struct Registry {
 
 pub type Result<T> = result::Result<T, Error>;
 
-#[derive(PartialEq, Copy)]
+#[derive(PartialEq, Clone, Copy)]
 pub enum Auth {
     Authorized,
     Unauthorized

diff --git a/src/rustversion.txt b/src/rustversion.txt
index 22e8ceff87b26eb7ea9e556a5ecd314764711a03..3447d643e421533103f1f0e097e797efd61bfc1e 100644 (file)
--- a/src/rustversion.txt
+++ b/src/rustversion.txt
@@ -1 +1 @@
-2015-04-02
+2015-04-04